diff --git a/system/core/Benchmark.php b/system/core/Benchmark.php
index 39027e8..c17e95a 100755
--- a/system/core/Benchmark.php
+++ b/system/core/Benchmark.php
@@ -46,7 +46,7 @@
 	 *
 	 * @var array
 	 */
-	public $marker = array();
+	public $marker =	array();
 
 	// --------------------------------------------------------------------
 
@@ -119,4 +119,4 @@
 }
 
 /* End of file Benchmark.php */
-/* Location: ./system/core/Benchmark.php */
\ No newline at end of file
+/* Location: ./system/core/Benchmark.php */
diff --git a/system/core/CodeIgniter.php b/system/core/CodeIgniter.php
index 2935822..793c468 100755
--- a/system/core/CodeIgniter.php
+++ b/system/core/CodeIgniter.php
@@ -40,7 +40,7 @@
 /**
  * CodeIgniter Version
  *
- * @var string
+ * @var	string
  *
  */
 	define('CI_VERSION', '3.0-dev');
diff --git a/system/core/Common.php b/system/core/Common.php
index 075b221..78aa6e8 100644
--- a/system/core/Common.php
+++ b/system/core/Common.php
@@ -39,7 +39,6 @@
 
 // ------------------------------------------------------------------------
 
-
 if ( ! function_exists('is_php'))
 {
 	/**
diff --git a/system/core/Config.php b/system/core/Config.php
index fc61834..1eab08b 100755
--- a/system/core/Config.php
+++ b/system/core/Config.php
@@ -45,14 +45,14 @@
 	 *
 	 * @var array
 	 */
-	public $config = array();
+	public $config =	array();
 	
 	/**
 	 * List of all loaded config files
 	 *
 	 * @var array
 	 */
-	public $is_loaded = array();
+	public $is_loaded =	array();
 	
 	/**
 	 * List of paths to search when trying to load a config file.
@@ -60,7 +60,7 @@
 	 *
 	 * @var array
 	 */
-	public $_config_paths = array(APPPATH);
+	public $_config_paths =	array(APPPATH);
 
 	/**
 	 * Constructor
diff --git a/system/core/Controller.php b/system/core/Controller.php
index 0c6c471..1f69146 100644
--- a/system/core/Controller.php
+++ b/system/core/Controller.php
@@ -42,7 +42,7 @@
 	/**
 	 * Reference to the global CI instance
 	 *
-	 * @var object
+	 * @var	object
 	 */
 	private static $instance;
 
diff --git a/system/core/Exceptions.php b/system/core/Exceptions.php
index f55f9fc..2e9f0c7 100755
--- a/system/core/Exceptions.php
+++ b/system/core/Exceptions.php
@@ -39,14 +39,14 @@
 	/**
 	 * Nesting level of the output buffering mechanism
 	 *
-	 * @var int
+	 * @var	int
 	 */
 	public $ob_level;
 
 	/**
 	 * List if available error levels
 	 *
-	 * @var array
+	 * @var	array
 	 */
 	public $levels = array(
 		E_ERROR			=>	'Error',
diff --git a/system/core/Hooks.php b/system/core/Hooks.php
index 672fe29..b42ecbe 100755
--- a/system/core/Hooks.php
+++ b/system/core/Hooks.php
@@ -43,21 +43,21 @@
 	 *
 	 * @var bool
 	 */
-	public $enabled = FALSE;
+	public $enabled =	FALSE;
 	
 	/**
 	 * List of all hooks set in config/hooks.php
 	 *
 	 * @var array
 	 */
-	public $hooks = array();
+	public $hooks =	array();
 	
 	/**
 	 * Determines wether hook is in progress, used to prevent infinte loops
 	 *
 	 * @var bool
 	 */
-	public $in_progress	= FALSE;
+	public $in_progress	=	FALSE;
 
 	/**
 	 * Initialize the Hooks Preferences
diff --git a/system/core/Input.php b/system/core/Input.php
index 7ee8f36..fc2a550 100755
--- a/system/core/Input.php
+++ b/system/core/Input.php
@@ -43,28 +43,28 @@
 	 *
 	 * @var string
 	 */
-	public $ip_address = FALSE;
+	public $ip_address =	FALSE;
 	
 	/**
 	 * user agent (web browser) being used by the current user
 	 *
 	 * @var string
 	 */
-	public $user_agent = FALSE;
+	public $user_agent =	FALSE;
 	
 	/**
 	 * If FALSE, then $_GET will be set to an empty array
 	 *
 	 * @var bool
 	 */
-	protected $_allow_get_array = TRUE;
+	protected $_allow_get_array =	TRUE;
 	
 	/**
 	 * If TRUE, then newlines are standardized
 	 *
 	 * @var bool
 	 */
-	protected $_standardize_newlines = TRUE;
+	protected $_standardize_newlines =	TRUE;
 	
 	/**
 	 * Determines whether the XSS filter is always active when GET, POST or COOKIE data is encountered
@@ -72,7 +72,7 @@
 	 *
 	 * @var bool
 	 */
-	protected $_enable_xss = FALSE;
+	protected $_enable_xss =	FALSE;
 	
 	/**
 	 * Enables a CSRF cookie token to be set.
@@ -80,14 +80,14 @@
 	 *
 	 * @var bool
 	 */
-	protected $_enable_csrf = FALSE;
+	protected $_enable_csrf =	FALSE;
 	
 	/**
 	 * List of all HTTP request headers
 	 *
 	 * @var array
 	 */
-	protected $headers = array();
+	protected $headers =	array();
 
 	/**
 	 * Constructor
diff --git a/system/core/Lang.php b/system/core/Lang.php
index 7abdc61..2963012 100755
--- a/system/core/Lang.php
+++ b/system/core/Lang.php
@@ -41,14 +41,14 @@
 	 *
 	 * @var array
 	 */
-	public $language = array();
+	public $language =	array();
 	
 	/**
 	 * List of loaded language files
 	 *
 	 * @var array
 	 */
-	public $is_loaded = array();
+	public $is_loaded =	array();
 
 	/**
 	 * Initialize language class
diff --git a/system/core/Loader.php b/system/core/Loader.php
index b99ce69..7fb3eab 100644
--- a/system/core/Loader.php
+++ b/system/core/Loader.php
@@ -51,77 +51,77 @@
 	 *
 	 * @var array
 	 */
-	protected $_ci_view_paths = array();
+	protected $_ci_view_paths =	array();
 	
 	/**
 	 * List of paths to load libraries from
 	 *
 	 * @var array
 	 */
-	protected $_ci_library_paths = array();
+	protected $_ci_library_paths =	array();
 	
 	/**
 	 * List of paths to load models from
 	 *
 	 * @var array
 	 */
-	protected $_ci_model_paths = array();
+	protected $_ci_model_paths =	array();
 	
 	/**
 	 * List of paths to load helpers from
 	 *
 	 * @var array
 	 */
-	protected $_ci_helper_paths = array();
+	protected $_ci_helper_paths =	array();
 	
 	/**
 	 * List of loaded base classes
 	 *
 	 * @var array
 	 */
-	protected $_base_classes = array(); // Set by the controller class
+	protected $_base_classes =	array(); // Set by the controller class
 	
 	/**
 	 * List of cached variables
 	 *
 	 * @var array
 	 */
-	protected $_ci_cached_vars = array();
+	protected $_ci_cached_vars =	array();
 	
 	/**
 	 * List of loaded classes
 	 *
 	 * @var array
 	 */
-	protected $_ci_classes = array();
+	protected $_ci_classes =	array();
 	
 	/**
 	 * List of loaded files
 	 *
 	 * @var array
 	 */
-	protected $_ci_loaded_files = array();
+	protected $_ci_loaded_files =	array();
 	
 	/**
 	 * List of loaded models
 	 *
 	 * @var array
 	 */
-	protected $_ci_models = array();
+	protected $_ci_models =	array();
 	
 	/**
 	 * List of loaded helpers
 	 *
 	 * @var array
 	 */
-	protected $_ci_helpers = array();
+	protected $_ci_helpers =	array();
 	
 	/**
 	 * List of class name mappings
 	 *
 	 * @var array
 	 */
-	protected $_ci_varmap = array(
+	protected $_ci_varmap =	array(
 		'unit_test' => 'unit',
 		'user_agent' => 'agent'
 	);
diff --git a/system/core/Output.php b/system/core/Output.php
index 0683539..513c657 100755
--- a/system/core/Output.php
+++ b/system/core/Output.php
@@ -50,49 +50,49 @@
 	 *
 	 * @var int
 	 */
-	public $cache_expiration = 0;
+	public $cache_expiration =	0;
 	
 	/**
 	 * List of server headers
 	 *
 	 * @var array
 	 */
-	public $headers = array();
+	public $headers =	array();
 	
 	/**
 	 * List of mime types
 	 *
 	 * @var array
 	 */
-	public $mime_types = array();
+	public $mime_types =	array();
 	
 	/**
 	 * Determines wether profiler is enabled
 	 *
 	 * @var book
 	 */
-	public $enable_profiler = FALSE;
+	public $enable_profiler =	FALSE;
 	
 	/**
 	 * Determines if output compression is enabled
 	 *
 	 * @var bool
 	 */
-	protected $_zlib_oc = FALSE;
+	protected $_zlib_oc =	FALSE;
 	
 	/**
 	 * List of profiler sections
 	 *
 	 * @var array
 	 */
-	protected $_profiler_sections = array();
+	protected $_profiler_sections =	array();
 	
 	/**
 	 * Whether or not to parse variables like {elapsed_time} and {memory_usage}
 	 *
 	 * @var bool
 	 */
-	public $parse_exec_vars = TRUE;
+	public $parse_exec_vars =	TRUE;
 
 	/**
 	 * Set up Output class
diff --git a/system/core/Router.php b/system/core/Router.php
index b5c2002..9314052 100755
--- a/system/core/Router.php
+++ b/system/core/Router.php
@@ -50,35 +50,35 @@
 	 *
 	 * @var array
 	 */
-	public $routes = array();
+	public $routes =	array();
 	
 	/**
 	 * List of error routes
 	 *
 	 * @var array
 	 */
-	public $error_routes = array();
+	public $error_routes =	array();
 	
 	/**
 	 * Current class name
 	 *
 	 * @var string
 	 */
-	public $class = '';
+	public $class =	'';
 	
 	/**
 	 * Current method name
 	 *
 	 * @var string
 	 */
-	public $method = 'index';
+	public $method =	'index';
 	
 	/**
 	 * Sub-directory that contains the requested controller class
 	 *
 	 * @var string
 	 */
-	public $directory = '';
+	public $directory =	'';
 	
 	/**
 	 * Default controller (and method if specific)
diff --git a/system/core/Security.php b/system/core/Security.php
index 1395116..974e2e4 100755
--- a/system/core/Security.php
+++ b/system/core/Security.php
@@ -41,14 +41,14 @@
 	 *
 	 * @var string
 	 */
-	protected $_xss_hash = '';
+	protected $_xss_hash =	'';
 
 	/**
 	 * Random Hash for Cross Site Request Forgery Protection Cookie
 	 *
 	 * @var string
 	 */
-	protected $_csrf_hash = '';
+	protected $_csrf_hash =	'';
 
 	/**
 	 * Expiration time for Cross Site Request Forgery Protection Cookie
@@ -56,28 +56,28 @@
 	 *
 	 * @var int
 	 */
-	protected $_csrf_expire = 7200;
+	protected $_csrf_expire =	7200;
 
 	/**
 	 * Token name for Cross Site Request Forgery Protection Cookie
 	 *
 	 * @var string
 	 */
-	protected $_csrf_token_name = 'ci_csrf_token';
+	protected $_csrf_token_name =	'ci_csrf_token';
 
 	/**
 	 * Cookie name for Cross Site Request Forgery Protection Cookie
 	 *
 	 * @var string
 	 */
-	protected $_csrf_cookie_name = 'ci_csrf_token';
+	protected $_csrf_cookie_name =	'ci_csrf_token';
 
 	/**
 	 * List of never allowed strings
 	 *
 	 * @var array
 	 */
-	protected $_never_allowed_str = array(
+	protected $_never_allowed_str =	array(
 		'document.cookie'	=> '[removed]',
 		'document.write'	=> '[removed]',
 		'.parentNode'		=> '[removed]',
@@ -95,7 +95,7 @@
 	 *
 	 * @var array
 	 */
-	protected $_never_allowed_regex = array(
+	protected $_never_allowed_regex =	array(
 		'javascript\s*:',
 		'expression\s*(\(|&\#40;)', // CSS and IE
 		'vbscript\s*:', // IE, surprise!
diff --git a/system/core/URI.php b/system/core/URI.php
index 1402953..ff2c458 100755
--- a/system/core/URI.php
+++ b/system/core/URI.php
@@ -42,7 +42,7 @@
 	 *
 	 * @var array
 	 */
-	public $keyval = array();
+	public $keyval =	array();
 	
 	/**
 	 * Current uri string
@@ -56,7 +56,7 @@
 	 *
 	 * @var array
 	 */
-	public $segments = array();
+	public $segments =	array();
 	
 	/**
 	 * Re-indexed list of uri segments
@@ -64,7 +64,7 @@
 	 *
 	 * @var array
 	 */
-	public $rsegments = array();
+	public $rsegments =	array();
 
 	/**
 	 * Constructor